auto merge of #973 : alexcrichton/cargo/issue-968, r=huonw
authorbors <bors@rust-lang.org>
Tue, 25 Nov 2014 06:44:17 +0000 (06:44 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Nov 2014 06:44:17 +0000 (06:44 +0000)
Closes #968


Trivial merge